improvement/CLDSRV-451-specific-7.70-apis-update by benzekrimaha · Pull Request #5495 · scality/cloudserver

benzekrimaha · 2023-12-14T13:22:00Z

Bucket policies are not correctly interpreted, this is part of the following epic to fix that: scality/Arsenal#2181

This PR is aiming to update get apis since object and bucket authorisations are made at API level and need to support implicit denies, ticket linked to this issue here : https://scality.atlassian.net/browse/CLDSRV-451

PRs providing implicit Deny logic to CS for processing in this PR
scality/Arsenal#2181 and scality/Arsenal#2193
https://github.com/scality/Vault/pull/2135
#5322
#5420
#5432
#5456
#5462
#5470
#5479

Here CI links for zenko tests :

As there are differences on the 8.x branches reviews are highly appreciated

bert-e · 2023-12-14T13:22:03Z

Hello benzekrimaha,

My role is to assist you with the merge of this
pull request. Please type @bert-e help to get information
on this process, or consult the user documentation.

Status report is not available.

bert-e · 2023-12-14T13:22:09Z

Incorrect fix version

The Fix Version/s in issue CLDSRV-451 contains:

7.70.11.3

Considering where you are trying to merge, I ignored possible hotfix versions and I expected to find:

7.70.36
8.6.17
8.7.37
8.8.11

Please check the Fix Version/s of CLDSRV-451, or the target
branch of this pull request.

benzekrimaha · 2023-12-14T13:23:37Z

ping

bert-e · 2023-12-14T13:23:46Z

Request integration branches

Waiting for integration branch creation to be requested by the user.

To request integration branches, please comment on this pull request with the following command:

/create_integration_branches

Alternatively, the /approve and /create_pull_requests commands will automatically
create the integration branches.

bert-e · 2023-12-14T13:30:03Z

Conflict

A conflict has been raised during the creation of
integration branch w/8.6/improvement/CLDSRV-451-specific-7.70-apis-update with contents from improvement/CLDSRV-451-specific-7.70-apis-update
and development/8.6.

I have not created the integration branch.

Here are the steps to resolve this conflict:

 $ git fetch
 $ git checkout -B w/8.6/improvement/CLDSRV-451-specific-7.70-apis-update origin/development/8.6
 $ git merge origin/improvement/CLDSRV-451-specific-7.70-apis-update
 $ # <intense conflict resolution>
 $ git commit
 $ git push -u origin w/8.6/improvement/CLDSRV-451-specific-7.70-apis-update

The following options are set: create_integration_branches

bert-e · 2023-12-14T13:30:11Z

Request integration branches

Waiting for integration branch creation to be requested by the user.

To request integration branches, please comment on this pull request with the following command:

/create_integration_branches

Alternatively, the /approve and /create_pull_requests commands will automatically
create the integration branches.

benzekrimaha · 2023-12-14T15:59:41Z

/create_integration_branches

bert-e · 2023-12-14T15:59:53Z

Conflict

A conflict has been raised during the creation of
integration branch w/8.6/improvement/CLDSRV-451-specific-7.70-apis-update with contents from improvement/CLDSRV-451-specific-7.70-apis-update
and development/8.6.

I have not created the integration branch.

Here are the steps to resolve this conflict:

 $ git fetch
 $ git checkout -B w/8.6/improvement/CLDSRV-451-specific-7.70-apis-update origin/development/8.6
 $ git merge origin/improvement/CLDSRV-451-specific-7.70-apis-update
 $ # <intense conflict resolution>
 $ git commit
 $ git push -u origin w/8.6/improvement/CLDSRV-451-specific-7.70-apis-update

The following options are set: create_integration_branches

benzekrimaha · 2023-12-14T16:04:50Z

ping

bert-e · 2023-12-14T16:05:03Z

Conflict

A conflict has been raised during the creation of
integration branch w/8.7/improvement/CLDSRV-451-specific-7.70-apis-update with contents from w/8.6/improvement/CLDSRV-451-specific-7.70-apis-update
and development/8.7.

I have not created the integration branch.

Here are the steps to resolve this conflict:

 $ git fetch
 $ git checkout -B w/8.7/improvement/CLDSRV-451-specific-7.70-apis-update origin/development/8.7
 $ git merge origin/w/8.6/improvement/CLDSRV-451-specific-7.70-apis-update
 $ # <intense conflict resolution>
 $ git commit
 $ git push -u origin w/8.7/improvement/CLDSRV-451-specific-7.70-apis-update

The following options are set: create_integration_branches

benzekrimaha · 2023-12-14T16:11:26Z

ping

bert-e · 2023-12-14T16:11:39Z

Conflict

A conflict has been raised during the creation of
integration branch w/8.8/improvement/CLDSRV-451-specific-7.70-apis-update with contents from w/8.7/improvement/CLDSRV-451-specific-7.70-apis-update
and development/8.8.

I have not created the integration branch.

Here are the steps to resolve this conflict:

 $ git fetch
 $ git checkout -B w/8.8/improvement/CLDSRV-451-specific-7.70-apis-update origin/development/8.8
 $ git merge origin/w/8.7/improvement/CLDSRV-451-specific-7.70-apis-update
 $ # <intense conflict resolution>
 $ git commit
 $ git push -u origin w/8.8/improvement/CLDSRV-451-specific-7.70-apis-update

The following options are set: create_integration_branches

bert-e · 2023-12-14T16:17:57Z

Waiting for approval

The following approvals are needed before I can proceed with the merge:

the author
2 peers

The following options are set: create_integration_branches

benzekrimaha · 2023-12-14T16:22:29Z

/reset

bert-e · 2023-12-14T16:22:35Z

Lossy reset warning

There seems to be manual commits on integration branches (e.g. conflict
resolutions) that will be lost if you chose to reset.

You can use the force_reset command if you still want me
to delete those branches.

The following options are set: create_integration_branches

benzekrimaha · 2023-12-14T16:23:10Z

@bert-e force_reset

bert-e · 2023-12-14T16:23:19Z

Reset complete

I have successfully deleted this pull request's integration branches.

The following options are set: create_integration_branches

bert-e · 2023-12-14T16:23:28Z

Conflict

A conflict has been raised during the creation of
integration branch w/8.6/improvement/CLDSRV-451-specific-7.70-apis-update with contents from improvement/CLDSRV-451-specific-7.70-apis-update
and development/8.6.

I have not created the integration branch.

Here are the steps to resolve this conflict:

 $ git fetch
 $ git checkout -B w/8.6/improvement/CLDSRV-451-specific-7.70-apis-update origin/development/8.6
 $ git merge origin/improvement/CLDSRV-451-specific-7.70-apis-update
 $ # <intense conflict resolution>
 $ git commit
 $ git push -u origin w/8.6/improvement/CLDSRV-451-specific-7.70-apis-update

The following options are set: create_integration_branches

benzekrimaha · 2023-12-14T16:30:14Z

ping

bert-e · 2023-12-14T16:30:26Z

Conflict

A conflict has been raised during the creation of
integration branch w/8.7/improvement/CLDSRV-451-specific-7.70-apis-update with contents from w/8.6/improvement/CLDSRV-451-specific-7.70-apis-update
and development/8.7.

I have not created the integration branch.

Here are the steps to resolve this conflict:

 $ git fetch
 $ git checkout -B w/8.7/improvement/CLDSRV-451-specific-7.70-apis-update origin/development/8.7
 $ git merge origin/w/8.6/improvement/CLDSRV-451-specific-7.70-apis-update
 $ # <intense conflict resolution>
 $ git commit
 $ git push -u origin w/8.7/improvement/CLDSRV-451-specific-7.70-apis-update

The following options are set: create_integration_branches

benzekrimaha · 2023-12-14T16:33:57Z

ping

bert-e · 2023-12-14T16:34:11Z

Conflict

A conflict has been raised during the creation of
integration branch w/8.8/improvement/CLDSRV-451-specific-7.70-apis-update with contents from w/8.7/improvement/CLDSRV-451-specific-7.70-apis-update
and development/8.8.

I have not created the integration branch.

Here are the steps to resolve this conflict:

 $ git fetch
 $ git checkout -B w/8.8/improvement/CLDSRV-451-specific-7.70-apis-update origin/development/8.8
 $ git merge origin/w/8.7/improvement/CLDSRV-451-specific-7.70-apis-update
 $ # <intense conflict resolution>
 $ git commit
 $ git push -u origin w/8.8/improvement/CLDSRV-451-specific-7.70-apis-update

The following options are set: create_integration_branches

benzekrimaha · 2023-12-14T16:38:37Z

ping

bert-e · 2023-12-14T16:38:51Z

Waiting for approval

The following approvals are needed before I can proceed with the merge:

the author
2 peers

The following options are set: create_integration_branches

benzekrimaha · 2023-12-14T16:39:11Z

/create_pull_requests

bert-e · 2023-12-14T16:39:27Z

Integration data created

I have created the integration data for the additional destination branches.

this pull request will merge improvement/CLDSRV-451-specific-7.70-apis-update into
development/7.70
w/8.6/improvement/CLDSRV-451-specific-7.70-apis-update will be merged into development/8.6 (pull request INTEGRATION [PR#5495 > development/8.6] improvement/CLDSRV-451-specific-7.70-apis-update #5496)
w/8.7/improvement/CLDSRV-451-specific-7.70-apis-update will be merged into development/8.7 (pull request INTEGRATION [PR#5495 > development/8.7] improvement/CLDSRV-451-specific-7.70-apis-update #5497)
w/8.8/improvement/CLDSRV-451-specific-7.70-apis-update will be merged into development/8.8 (pull request INTEGRATION [PR#5495 > development/8.8] improvement/CLDSRV-451-specific-7.70-apis-update #5498)

The following branches will NOT be impacted:

development/7.10
development/7.4

Follow integration pull requests if you would like to be notified of
build statuses by email.

The following options are set: create_pull_requests, create_integration_branches

bert-e · 2023-12-14T16:39:31Z

Waiting for approval

The following approvals are needed before I can proceed with the merge:

the author
2 peers

The following options are set: create_pull_requests, create_integration_branches

anurag4DSB

reveiwed integration branch #5497 (review)
there are new changes in the merge commit for metadataSearch, object Restore and routeveeam

anurag4DSB · 2023-12-14T16:41:27Z

Integration tests used: #5496

anurag4DSB

adding a blocker for merge as author will be OOO tomorrow and we need author approval

bert-e · 2023-12-14T16:49:20Z

Waiting for approval

The following approvals are needed before I can proceed with the merge:

the author
2 peers

The following reviewers are expecting changes from the author, or must review again:

@anurag4DSB

The following options are set: create_pull_requests, create_integration_branches

ok to merge, we found the issue.

bert-e · 2023-12-14T17:27:05Z

Waiting for approval

The following approvals are needed before I can proceed with the merge:

the author
2 peers

The following options are set: create_pull_requests, create_integration_branches

benzekrimaha · 2023-12-15T06:43:45Z

@bert-e approve

bert-e · 2023-12-15T06:44:06Z

In the queue

The changeset has received all authorizations and has been added to the
relevant queue(s). The queue(s) will be merged in the target development
branch(es) as soon as builds have passed.

The changeset will be merged in:

✔️ development/7.70
✔️ development/8.6
✔️ development/8.7
✔️ development/8.8

The following branches will NOT be impacted:

development/7.10
development/7.4

There is no action required on your side. You will be notified here once
the changeset has been merged. In the unlikely event that the changeset
fails permanently on the queue, a member of the admin team will
contact you to help resolve the matter.

IMPORTANT

Please do not attempt to modify this pull request.

Any commit you add on the source branch will trigger a new cycle after the
current queue is merged.
Any commit you add on one of the integration branches will be lost.

If you need this pull request to be removed from the queue, please contact a
member of the admin team now.

The following options are set: approve, create_pull_requests, create_integration_branches

bert-e · 2023-12-15T07:02:43Z

I have successfully merged the changeset of this pull request
into targetted development branches:

✔️ development/7.70
✔️ development/8.6
✔️ development/8.7
✔️ development/8.8

The following branches have NOT changed:

development/7.10
development/7.4

Please check the status of the associated issue CLDSRV-451.

Goodbye benzekrimaha.

scality deleted a comment from bert-e Dec 14, 2023

benzekrimaha changed the title ~~CLDSRV-451: updating buckettagging apis for impDeny~~ improvement/CLDSRV-451-specific-7.70-apis-update Dec 14, 2023

CLDSRV-451: updating buckettagging apis for impDeny

836fc80

benzekrimaha force-pushed the improvement/CLDSRV-451-specific-7.70-apis-update branch from 5fdb2b0 to 836fc80 Compare December 14, 2023 15:58

CLDSRV-451: bump Cloudserver version

717228b

scality deleted a comment from bert-e Dec 14, 2023

benzekrimaha marked this pull request as ready for review December 14, 2023 16:39

This was referenced Dec 14, 2023

INTEGRATION [PR#5495 > development/8.6] improvement/CLDSRV-451-specific-7.70-apis-update #5496

Merged

INTEGRATION [PR#5495 > development/8.7] improvement/CLDSRV-451-specific-7.70-apis-update #5497

Merged

bert-e mentioned this pull request Dec 14, 2023

INTEGRATION [PR#5495 > development/8.8] improvement/CLDSRV-451-specific-7.70-apis-update #5498

Merged

anurag4DSB approved these changes Dec 14, 2023

View reviewed changes

KazToozs approved these changes Dec 14, 2023

View reviewed changes

anurag4DSB previously requested changes Dec 14, 2023

View reviewed changes

anurag4DSB approved these changes Dec 14, 2023

View reviewed changes

bert-e merged commit 126ca35 into development/7.70 Dec 15, 2023

bert-e deleted the improvement/CLDSRV-451-specific-7.70-apis-update branch December 15, 2023 07:02

Conversation

benzekrimaha commented Dec 14, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

bert-e commented Dec 14, 2023

Hello benzekrimaha,

Uh oh!

bert-e commented Dec 14, 2023

Incorrect fix version

Uh oh!

benzekrimaha commented Dec 14, 2023

Uh oh!

bert-e commented Dec 14, 2023

Request integration branches

Uh oh!

bert-e commented Dec 14, 2023

Conflict

Uh oh!

bert-e commented Dec 14, 2023

Request integration branches

Uh oh!

benzekrimaha commented Dec 14, 2023

Uh oh!

bert-e commented Dec 14, 2023

Conflict

Uh oh!

benzekrimaha commented Dec 14, 2023

Uh oh!

bert-e commented Dec 14, 2023

Conflict

Uh oh!

benzekrimaha commented Dec 14, 2023

Uh oh!

bert-e commented Dec 14, 2023

Conflict

Uh oh!

bert-e commented Dec 14, 2023

Waiting for approval

Uh oh!

benzekrimaha commented Dec 14, 2023

Uh oh!

bert-e commented Dec 14, 2023

Lossy reset warning

Uh oh!

benzekrimaha commented Dec 14, 2023

Uh oh!

bert-e commented Dec 14, 2023

Reset complete

Uh oh!

bert-e commented Dec 14, 2023

Conflict

Uh oh!

benzekrimaha commented Dec 14, 2023

Uh oh!

bert-e commented Dec 14, 2023

Conflict

Uh oh!

benzekrimaha commented Dec 14, 2023

Uh oh!

bert-e commented Dec 14, 2023

Conflict

Uh oh!

benzekrimaha commented Dec 14, 2023

Uh oh!

bert-e commented Dec 14, 2023

Waiting for approval

Uh oh!

benzekrimaha commented Dec 14, 2023

Uh oh!

bert-e commented Dec 14, 2023

Integration data created

Uh oh!

bert-e commented Dec 14, 2023

Waiting for approval

Uh oh!

anurag4DSB left a comment

Choose a reason for hiding this comment

Uh oh!

anurag4DSB commented Dec 14, 2023

Uh oh!

benzekrimaha commented Dec 14, 2023 •

edited

Loading

anurag4DSB left a comment •

edited

Loading